From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 31 Jan 2026 23:41:44 +0000 (+0000)
Subject: Merge version 1:30.1+1-6+rpi1 and 1:30.2+1-2 to produce 1:30.2+1-2+rpi1
X-Git-Tag: archive/raspbian/1%30.2+1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=de4ef16d6dceb70030e500c3795f17130de0e2f4;p=emacs.git

Merge version 1:30.1+1-6+rpi1 and 1:30.2+1-2 to produce 1:30.2+1-2+rpi1
---

de4ef16d6dceb70030e500c3795f17130de0e2f4
diff --cc debian/changelog
index 222047fd7fc,7523887d20e..43b0d6cfab3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,48 +1,56 @@@
- emacs (1:30.1+1-6+rpi1) trixie-staging; urgency=medium
++emacs (1:30.2+1-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1:29.4+1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 28 Jul 2024 23:24:37 +0000]
 +  * Switch to gcc 14.
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 17:33:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 31 Jan 2026 23:41:43 +0000
++
+ emacs (1:30.2+1-2) unstable; urgency=medium
+ 
+   [ Rob Browning ]
+   * Mark esh-proc-test/kill-pipeline as unstable for now.
+     Skip it since it fails sporadically on at least s390x. Add
+     0024-Mark-esh-proc-test-kill-pipeline-as-unstable-for-now.patch to
+     address the issue.
+ 
+   [ Sean Whitton ]
+   * Boost BASE_PURESIZE further (Closes: #1121058).
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Thu, 20 Nov 2025 18:22:13 +0000
+ 
+ emacs (1:30.2+1-1) unstable; urgency=medium
+ 
+   * Merge upstream version 30.2
+   * Update debian/copyright for 30.2
+   * debian/copyright: add entry for emacs_wrench.png.
+ 
+  -- Rob Browning <rlb@defaultvalue.org>  Sun, 09 Nov 2025 16:49:07 -0600
+ 
+ emacs (1:30.1+1-9) unstable; urgency=medium
+ 
+   * Adjust shr-tests/zoom test to work with libxml2 2.14+ Add
+     0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch to
+     address the issue. Thanks to Matthias Klose for reporting the problem.
+     (Closes: #1106354)
+ 
+  -- Rob Browning <rlb@defaultvalue.org>  Sun, 24 Aug 2025 20:04:56 -0500
+ 
+ emacs (1:30.1+1-8) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Sun, 10 Aug 2025 10:21:45 +0100
+ 
+ emacs (1:30.1+1-7) experimental; urgency=medium
+ 
+   * Add & run script to generate Breaks/Replaces/Provides for builtin
+     packages during the build (Closes: #1103033).
+     Thanks to Xiyue Deng for the script.
+ 
+   * Backport upstream commit adding builtin packages query interfaces.
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 25 Jul 2025 09:37:19 +0100
  
  emacs (1:30.1+1-6) unstable; urgency=medium